Auto merge of #1222 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 25 Jan 2015 07:48:47 +0000 (07:48 +0000)
committerbors <bors@rust-lang.org>
Sun, 25 Jan 2015 07:48:47 +0000 (07:48 +0000)

Trivial merge